Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 10 Jun 2011 23:31:05 +0000 (16:31 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 10 Jun 2011 23:31:05 +0000 (16:31 -0700)
commit55b825f2efbe3ce34929a265f67641cdc0649fc6
treecf421a0e6cb1c9ca1a539885ac894489f2077b7c
parent9df13edd84fae91ee61190d80bbf2382d119e860
parent9b6d8264301a277b46e6d75ea867a11b1ff9d474
Merge from trunk.